Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issue #510: Support text blocks in Diet templates #518

Merged
merged 1 commit into from
Feb 17, 2014
Merged

Fix issue #510: Support text blocks in Diet templates #518

merged 1 commit into from
Feb 17, 2014

Conversation

nazriel
Copy link
Contributor

@nazriel nazriel commented Feb 13, 2014

Fix issue #510

Redo of #514 (which history got screwed up ;) )

Added tests for cases mentioned by Sönke

Some care needs to be taken to handle anything after the dot correctly:

    pre.test -> <pre class="test">
    pre.test. -> <pre class="test"> + block text
    pre. test -> <pre> + block text (jade apprently ignores the "test" in this case
    pre(). -> <pre> + block text

@nazriel nazriel mentioned this pull request Feb 13, 2014
Closed
@s-ludwig
Copy link
Member

Just one question - shouldn't the "blocktag" case be removed and the code moved into the if statement? At least Jade seems to treat "blocktag" as an ordinary tag.

@nazriel
Copy link
Contributor Author

nazriel commented Feb 13, 2014

@s-ludwig you are totally right!
I should stop coding at those hours ;)

Btw, Sönke, DMD-head seems to be breaking stuff again... meh.
Should I report it or are you aware of it?

@s-ludwig
Copy link
Member

If you have time, that would be much appreciated! What did break this time?

@nazriel
Copy link
Contributor Author

nazriel commented Feb 14, 2014

@s-ludwig pull itself is updated.

DMD ~master issue reported here: #526

@s-ludwig
Copy link
Member

Can you issue a quick rebase? Seems like the unit tests of the last pull request got in the way.

@nazriel
Copy link
Contributor Author

nazriel commented Feb 17, 2014

@s-ludwig done!
Sorry for delay, exams @ Uni 👻

@s-ludwig
Copy link
Member

Thanks, and good luck with the exams!

s-ludwig added a commit that referenced this pull request Feb 17, 2014
@s-ludwig
Merge pull request #518 from nazriel/issue510
a336373 
Fix issue #510: Support text blocks in Diet templates
@s-ludwig s-ludwig merged commit a336373 into vibe-d:master Feb 17, 2014
@nazriel
Copy link
Contributor Author

nazriel commented Feb 17, 2014

@s-ludwig thanks for merging!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nazriel @s-ludwig